From e05ee9980b6c29682b01982040da8ea481e0683f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 16 Oct 2014 08:36:57 -0700 Subject: [PATCH] Require `make` is run before `make install` I can't quite remember why this ifdef is present to silently run `make` as a normal user, and it doesn't seem to work if `make install` is run while as root, so I'm just removing it and requiring that `make` is run before `make install` unconditionally. Closes #708 --- Makefile.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2b07d618e..73aedcaf2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -149,10 +149,6 @@ distcheck-$(1): dist-$(1) $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-manifest-$(1) tar -czvf $$@ -C $$(@D) $$(PKG_NAME)-$(1) -ifeq (root user, $$(USER) $$(patsubst %,user,$$(SUDO_USER))) -prepare-manifest-$(1): - @sudo -u "$$$$SUDO_USER" $$(MAKE) prepare-manifest-$(1) -else prepare-manifest-$(1): @[ -f $$(TARGET_$(1))/cargo$$(X) ] || echo 'Please run `make` first' @[ -f $$(TARGET_$(1))/cargo$$(X) ] @@ -172,7 +168,6 @@ prepare-manifest-$(1): $$(PKGDIR_$(1)) mv $$(DISTDIR_$(1))/manifest-$$(PKG_NAME).in \ $$(PKGDIR_$(1))/lib/cargo/manifest.in -endif install-$(1): prepare-manifest-$(1) $$(PKGDIR_$(1))/install.sh \ -- 2.30.2